From 713044dc5695c3b620e1f427acfab6c0ce6b5445 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= <ok@src.gnome.org>
Date: Fri, 2 Jun 2006 08:51:39 +0000
Subject: [PATCH] added babl-classes to the installed headers

---
 ChangeLog           | 11 +++++++++++
 babl/Makefile.am    |  3 ++-
 babl/babl-classes.h |  8 +++++---
 babl/babl.h         |  1 +
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b2cbc66..f9d94d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-06-02  Øyvind Kolås  <pippin@gimp.org>
+
+	I'm not entirely sure about installing babl-classes.h like this, it
+	might make more sense to create setters/getters to be used. Thus
+	making it possible to extend the structs at a later stage without breaking
+	binary compatibility.
+
+	* babl/Makefile.am: Added babl-classes.h to the installed headers
+	* babl/babl-classes.h: Made the magic number fit in 32bit int.
+	* babl/babl.h: include babl-classes.h
+
 2006-02-22  Øyvind Kolås  <pippin@gimp.org>
 
 	* docs/index-static.html.in: added a link to the DHTML version of the
diff --git a/babl/Makefile.am b/babl/Makefile.am
index dccccab..ffc0338 100644
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -41,7 +41,8 @@ h_sources  =             		\
 
 library_includedir=$(includedir)/babl-$(BABL_API_VERSION)/babl
 library_include_HEADERS =		\
-	babl.h
+	babl.h                          \
+        babl-classes.h
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl/base
 
diff --git a/babl/babl-classes.h b/babl/babl-classes.h
index 63ed19e..24ca3db 100644
--- a/babl/babl-classes.h
+++ b/babl/babl-classes.h
@@ -47,7 +47,7 @@ typedef long (*BablFuncPlanar)    (int    src_bands,
  * differentiation in polymorphic functions. (as well as manual
  * type check assertions).
  */
-#define BABL_MAGIC   0xbAb10000
+#define BABL_MAGIC   0xbAb100
 
 typedef enum {
   BABL_INSTANCE = BABL_MAGIC,
@@ -219,7 +219,9 @@ typedef struct
   BablConversion  *conversion;
 } BablFishSimple;
 
-
+#ifndef BABL_HARD_MAX_PATH_LENGTH
+#define BABL_HARD_MAX_PATH_LENGTH 16
+#endif
 
 /* BablFishPath is a combination of registered conversions, both
  * from the reference types / model conversions, and optimized format to
@@ -236,8 +238,8 @@ typedef struct
   double           cost;   /* number of  ticks *10 + chain_length */
   double           loss;   /* error introduced */
 
-  BablConversion  *conversion[BABL_HARD_MAX_PATH_LENGTH];
   int              conversions;
+  BablConversion  *conversion[BABL_HARD_MAX_PATH_LENGTH];
 } BablFishPath;
 
 /* BablFishReference 
diff --git a/babl/babl.h b/babl/babl.h
index ebedf68..92fc330 100644
--- a/babl/babl.h
+++ b/babl/babl.h
@@ -25,6 +25,7 @@
 #ifndef _BABL_H
 #define _BABL_H
 
+#include "babl-classes.h"
 #ifdef _BABL_INTERNAL_H
 #error babl.h included after babl-internal.h
 #endif
-- 
2.30.2